x86: Remove cpu_init_r() for x86

Since cpu_init_interrupts() was moved out of cpu_init_r(), it is
useless to keep cpu_init_r() for x86, thus remove it.

Signed-off-by: Bin Meng <[email protected]>
Acked-by: Simon Glass <[email protected]>
Tested-by: Simon Glass <[email protected]>

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index ac253922ae4a6cede3b117d7e89263bb7699fe28..cf421faf66b5960673284b5c9a2b462dbc303f51 100644 (file)
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -320,12 +320,6 @@ int x86_cpu_init_f(void)
        return 0;
 }
 
-int x86_cpu_init_r(void)
-{
-       return 0;
-}
-int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r")));
-
 void x86_enable_caches(void)
 {
        unsigned long cr0;

diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index 98217dd615ff3ea9661c7cb0ce78c4f68bef9a36..36145cb0a81552fe78aa5409100b22d93d097cb1 100644 (file)
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -10,8 +10,6 @@
 
 /* cpu/.../cpu.c */
 int arch_cpu_init(void);
-int x86_cpu_init_r(void);
-int cpu_init_r(void);
 int x86_cpu_init_f(void);
 int cpu_init_f(void);
 void init_gd(gd_t *id, u64 *gdt_addr);

diff --git a/common/board_r.c b/common/board_r.c
index bfa74c7399e086aa139963fa0bc70c9eebcdf913..9f085b13821211d6df1dcef6bef684341631b8df 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -775,7 +775,7 @@ init_fnc_t init_sequence_r[] = {
        initr_flash,
 #endif
        INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_PPC) || defined(CONFIG_X86)
+#if defined(CONFIG_PPC)
        /* initialize higher level parts of CPU like time base and timers */
        cpu_init_r,
 #endif